Don't leak default_sort_data. (#346341, Christian Weiske)

2006-07-02  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtktreemodelsort.c (gtk_tree_model_sort_finalize):
        Don't leak default_sort_data.  (#346341, Christian Weiske)

diff --git a/ChangeLog b/ChangeLog
index 1358d65b2fa1067dd8f509877717251ad12fb086..fc000cfc32ed6c22d1a5f909c21192c747f9dd51 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-06-30  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktreemodelsort.c (gtk_tree_model_sort_finalize):
+       Don't leak default_sort_data.  (#346341, Christian Weiske)
+
        * gtk/Makefile.am: Make sure all win32-specific printing
        sources are distributed.  (#346312, Erik van Pienbroek)
        

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1358d65b2fa1067dd8f509877717251ad12fb086..fc000cfc32ed6c22d1a5f909c21192c747f9dd51 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2006-06-30  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktreemodelsort.c (gtk_tree_model_sort_finalize):
+       Don't leak default_sort_data.  (#346341, Christian Weiske)
+
        * gtk/Makefile.am: Make sure all win32-specific printing
        sources are distributed.  (#346312, Erik van Pienbroek)
        

diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c
index 0a744aca7ed3ad07ce0d7d0b3820166906d69d01..b557fe3f166ef543d346e38b11f025e30a2026b9 100644 (file)
--- a/gtk/gtktreemodelsort.c
+++ b/gtk/gtktreemodelsort.c
@@ -353,6 +353,14 @@ gtk_tree_model_sort_finalize (GObject *object)
       tree_model_sort->sort_list = NULL;
     }
 
+  if (tree_model_sort->default_sort_destroy)
+    {
+      tree_model_sort->default_sort_destroy (tree_model_sort->default_sort_data);
+      tree_model_sort->default_sort_destroy = NULL;
+      tree_model_sort->default_sort_data = NULL;
+    }
+
+
   /* must chain up */
   G_OBJECT_CLASS (gtk_tree_model_sort_parent_class)->finalize (object);
 }